debcbcc1454789936407583fe0aba8e158b16cad,utils/src/com/cloud/utils/S3Utils.java,S3Utils,listDirectory,#String#String#AmazonS3#,340

Before Change


     ObjectListing objectListing;

     do {
      objectListing = client.listObjects(listObjectsRequest);
      if (objectListing != null )
        objects.addAll(objectListing.getObjectSummaries());
      listObjectsRequest.setMarker(objectListing.getNextMarker());

After Change


        List<S3ObjectSummary> objects = new ArrayList<S3ObjectSummary>();
        ListObjectsRequest listObjectsRequest = new ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + SEPARATOR);

        ObjectListing ol = client.listObjects(listObjectsRequest);
        while (ol != null && ol.isTruncated()) {
            objects.addAll(ol.getObjectSummaries());
            listObjectsRequest.setMarker(ol.getNextMarker());
            ol = client.listObjects(listObjectsRequest);